bitkeeper revision 1.1159.1.518 (41d448acXfjJK8iSoExMLCtViOvsoA)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 30 Dec 2004 18:27:56 +0000 (18:27 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 30 Dec 2004 18:27:56 +0000 (18:27 +0000)
commit7af04b80e540cb792c3422bf290460c5e8e0c372
treea2203a7aedd51ed8193a320ea02b61df9b7c3374
parentac2cb8a8afdab2b1bad8bce4e51e3536a9ed00d7
parent49f6e16ab2c596ced7b4feee709bc01e71808431
bitkeeper revision 1.1159.1.518 (41d448acXfjJK8iSoExMLCtViOvsoA)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
.rootkeys
xen/arch/x86/memory.c
xen/arch/x86/setup.c
xen/arch/x86/x86_32/mm.c
xen/common/page_alloc.c
xen/include/asm-x86/config.h
xen/include/asm-x86/e820.h
xen/include/asm-x86/mm.h
xen/include/asm-x86/page.h